From 0a91e7600ed098ebe53add385b80e0bb783890cb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Oct 2008 08:49:18 +0000 Subject: [PATCH] =?utf8?q?Bug=20557316=20=E2=80=93=20GtkLinkButton=20shoul?= =?utf8?q?d=20consider=20user-defined=20tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gtk/gtklinkbutton.c (gtk_link_button_query_tooltip_cb): Only override the tooltip if not previously set svn path=/trunk/; revision=21728 --- ChangeLog | 7 +++++++ gtk/gtklinkbutton.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 07e78e77f5..e70b4427eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-30 Christian Dywan + + Bug 557316 – GtkLinkButton should consider user-defined tooltip + + * gtk/gtklinkbutton.c (gtk_link_button_query_tooltip_cb): + Only override the tooltip if not previously set + 2008-10-29 Christian Dywan Bug 557762 – Misleading error message in GDK DirectFB diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 9a6d134e99..6db17a933b 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -620,7 +620,9 @@ gtk_link_button_query_tooltip_cb (GtkWidget *widget, label = gtk_button_get_label (GTK_BUTTON (link_button)); uri = link_button->priv->uri; - if (label && *label != '\0' && uri && strcmp (label, uri) != 0) + if (!gtk_widget_get_tooltip_text (widget) + && !gtk_widget_get_tooltip_markup (widget) + && label && *label != '\0' && uri && strcmp (label, uri) != 0) { gtk_tooltip_set_text (tooltip, uri); return TRUE; -- 2.30.2